rust: Update to glib 0.20

Since we're releasing a new version of our crates,
let's update to the latest.

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/Cargo.toml b/Cargo.toml
index dbc3185d43545624e4aebcdfd009fb7d72f5c9b9..f3037755bd26d1817a3f813167c3ccc79dda5e6b 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,8 +37,8 @@ members = [".", "rust-bindings/sys"]
 base64 = "0.20.0"
 bitflags = "1.2.1"
 ffi = { package = "ostree-sys", path = "rust-bindings/sys", version = "0.15.0" }
-gio = "0.18"
-glib = "0.18"
+gio = "0.20"
+glib = "0.20"
 hex = "0.4.2"
 libc = "0.2"
 once_cell = "1.4.0"

diff --git a/rust-bindings/Makefile b/rust-bindings/Makefile
index ae67743180d588844dbd0de14b5e6d7513c8f2ab..87fc32abcf4d97305a67443ee3de46f4f6960444 100644 (file)
--- a/rust-bindings/Makefile
+++ b/rust-bindings/Makefile
@@ -1,6 +1,6 @@
 GIR_REPO := https://github.com/gtk-rs/gir.git
 GIR_VERSION := 5433e2582f831d551789ee95fa04188d2a5fd3e5 # 0.20.4
-GIR_FILES_VERSION := 0.19.0
+GIR_FILES_VERSION := 0.20.0
 OSTREE_REPO := ../ostree
 OSTREE_VERSION := patch-v2022.2
 RUSTDOC_STRIPPER_VERSION := 0.1.17

diff --git a/rust-bindings/src/auto/repo.rs b/rust-bindings/src/auto/repo.rs
index 583f5c1ad220be262f5ff17f03027510169dc311..21ae041f7f78a0cb2b61d87d8375c3a6bfdd7fd2 100644 (file)
--- a/rust-bindings/src/auto/repo.rs
+++ b/rust-bindings/src/auto/repo.rs
@@ -101,6 +101,8 @@ impl Repo {
         }
     }
 
+    #[cfg(feature = "v2024_7")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2024_7")))]
     #[doc(alias = "ostree_repo_checkout_composefs")]
     pub fn checkout_composefs(&self, options: Option<&glib::Variant>, destination_dfd: i32, destination_path: &str, checksum: &str, cancellable: Option<&impl IsA<gio::Cancellable>>) -> Result<(), glib::Error> {
         unsafe {

diff --git a/rust-bindings/src/auto/versions.txt b/rust-bindings/src/auto/versions.txt
index 4f5f3dd6075750dc640884f7d111607cf7a6f252..0ee05397c1e280aa8315b9d31430a5fadf2ab275 100644 (file)
--- a/rust-bindings/src/auto/versions.txt
+++ b/rust-bindings/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 5433e2582f83)
-from gir-files (@ 533c8b9281ba)
+from gir-files (@ b89f209a09cf)

diff --git a/rust-bindings/src/repo.rs b/rust-bindings/src/repo.rs
index 548cbc8ed9e9081d2d338b87570d37df47de08c8..4ced8ed770e773853e502248b4a6389a86b8e032 100644 (file)
--- a/rust-bindings/src/repo.rs
+++ b/rust-bindings/src/repo.rs
@@ -5,7 +5,8 @@ use crate::RepoMode;
 use crate::{Checksum, ObjectDetails, ObjectName, ObjectType, Repo, RepoTransactionStats};
 use ffi::OstreeRepoListObjectsFlags;
 use glib::ffi as glib_sys;
-use glib::{self, translate::*, Error, IsA};
+use glib::prelude::*;
+use glib::{self, translate::*, Error};
 #[cfg(any(feature = "v2017_10", feature = "dox"))]
 use std::os::fd::BorrowedFd;
 use std::{

diff --git a/rust-bindings/src/sysroot.rs b/rust-bindings/src/sysroot.rs
index 3d5082b5708fd943a59fceabd35156c9bde59e91..30bccd02270a556f0ba66126fd47607015187dea 100644 (file)
--- a/rust-bindings/src/sysroot.rs
+++ b/rust-bindings/src/sysroot.rs
@@ -74,6 +74,8 @@ impl Sysroot {
 
 #[cfg(test)]
 mod tests {
+    use gio::prelude::FileExt;
+
     use super::*;
 
     #[test]
@@ -112,6 +114,6 @@ mod tests {
 
             sysroot.path()
         };
-        assert_eq!(path_created.to_string(), path_loaded.to_string());
+        assert_eq!(path_created.path(), path_loaded.path());
     }
 }

diff --git a/rust-bindings/sys/Cargo.toml b/rust-bindings/sys/Cargo.toml
index f24c765cb2acb9001492e85a19777bf9b424db73..6312cc5bb0409648608e1bc4237c276562926f22 100644 (file)
--- a/rust-bindings/sys/Cargo.toml
+++ b/rust-bindings/sys/Cargo.toml
@@ -5,13 +5,13 @@ system-deps = "7"
 libc = "0.2"
 
 [dependencies.gio-sys]
-version = "0.18"
+version = "0.20"
 
 [dependencies.glib-sys]
-version = "0.18"
+version = "0.20"
 
 [dependencies.gobject-sys]
-version = "0.18"
+version = "0.20"
 
 [dev-dependencies]
 shell-words = "1.0.0"
@@ -68,7 +68,8 @@ v2022_7 = ["v2022_5"]
 v2023_1 = ["v2022_7"]
 v2023_8 = ["v2023_1"]
 v2023_11 = ["v2023_8"]
-v2025_1 = ["v2023_11"]
+v2025_1 = ["v2024_7"]
+v2024_7 = ["v2023_11"]
 
 [lib]
 name = "ostree_sys"
@@ -245,3 +246,6 @@ version = "2023.11"
 
 [package.metadata.system-deps.ostree_1.v2025_1]
 version = "2025.1"
+
+[package.metadata.system-deps.ostree_1.v2024_7]
+version = "2024.7"

diff --git a/rust-bindings/sys/src/auto/versions.txt b/rust-bindings/sys/src/auto/versions.txt
index 4f5f3dd6075750dc640884f7d111607cf7a6f252..0ee05397c1e280aa8315b9d31430a5fadf2ab275 100644 (file)
--- a/rust-bindings/sys/src/auto/versions.txt
+++ b/rust-bindings/sys/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 5433e2582f83)
-from gir-files (@ 533c8b9281ba)
+from gir-files (@ b89f209a09cf)

diff --git a/rust-bindings/sys/src/lib.rs b/rust-bindings/sys/src/lib.rs
index 03814605065188324a3e0b8d3ab54b8db733d44a..c9b571487f67e3320df549e9ea6f297747c0f82d 100644 (file)
--- a/rust-bindings/sys/src/lib.rs
+++ b/rust-bindings/sys/src/lib.rs
@@ -1854,6 +1854,8 @@ extern "C" {
         cancellable: *mut gio::GCancellable,
         error: *mut *mut glib::GError,
     ) -> gboolean;
+    #[cfg(feature = "v2024_7")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v2024_7")))]
     pub fn ostree_repo_checkout_composefs(
         self_: *mut OstreeRepo,
         options: *mut glib::GVariant,